CI: https://ci.nodejs.org/job/node-test-pull-request/8787/

CI seems OK, 2 unstable results due to a flaky test.

Pre-land CI: https://ci.nodejs.org/job/node-test-pull-request/8926/

@nataly87s It seems like you accidentally pushed a merge commit instead of your rebased changes. This makes it difficult to run CI against your changes and also requires a manual rebase while landing this PR. I assume you added https://github.com/nodejs/node.git as the upstream repository. If you did not, you can add it like this:

git remote add upstream https://github.com/nodejs/node.git

Please follow these steps to perform a proper rebase:

git reset --hard 44cfad0a5e41c99ab3bef41e5cf5b9c4f7ed742e
git fetch upstream
git rebase upstream/master

There will likely be some conflicts at this point. Running git status shows you a list of "Unmerged paths", the files with conflicts will be marked as "both modified". After fixing the rebase conflicts in these files, you can continue:

git rebase --continue

If everything worked, you should have a single commit on top of our upstream master containing your changes. You can push the changes to your repository using

git push origin master --force

By the way, you usually don't want to create pull requests from a master branch of your own repository. Most people create a new branch for each PR, this makes it simpler to work on multiple PRs at the same time and to rebase changes.

If you need further assistance, please let me know.

@tniessen Thanks, I'll do it as soon as I get to my laptop

@tniessen I did the merge directly in github, but i tried to do what you said anyway...
When i tried to do

git remote add origin https://github.com/nodejs/node.git

I got this message

fatal: remote origin already exists.

I usually use SourceTree for anything related to git, so I'm kinda slow with it. Sorry ¯\(ツ)/¯

git remote add origin https://github.com/nodejs/node.git

you actually need to do:

git remote add upstream https://github.com/nodejs/node.git

then do

git remove -v

should look something like:

d:\code\node-cur$ git remote -v
origin  https://github.com/refack/node.git (fetch)
origin  https://github.com/refack/node.git (push)
upstream        https://github.com/nodejs/node.git (fetch)
upstream        https://github.com/nodejs/node.git (push)

but with your handle

Sorry, my bad, @refack is correct, origin is your own repo. I also forgot that you need to force-push to master (instead of a normal push which won't let you overwrite existing history), I edited my comment.

Ok, I did the rebase, but then

nataly-mac:node nataly$ git push origin master
To https://github.com/nataly87s/node.git
 ! [rejected]              master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/nataly87s/node.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@nataly87s That's what I am talking about ("force push"), you need to use git push --force origin master. This allows to overwrite existing history.

Done.

So git protects you from trying to push something that is not a direct extension of the current tree (something with just more commit). There are two ways to override this:

1. git push --force-with-lease will push it git can recognize all the commits you have locally and remotely (which is what happens when you rebase)
2. The stronger git push --force or git push -f which will push you branch anyway.

I see by now @tniessen answer, but I'm posting anyway for context and posterity...

Done.

👍

How's the weather there? It's been quite Israeli here (Boston) this week (33° with 90% humidity), but with crazy 100mm 2-hour rain storms every other day, and golf ball sized hail ⛳️ once a week.

Setting it up for @tniessen to land: https://ci.nodejs.org/job/node-test-commit/10888/ 🏐

I don't know whats the temperature, but it's hot as hell.
Even the water at the beach is next to boiling hot. But at least there's AC everywhere (except the beach)